use qPrintable with warning() and fatal() instead of what seems like an arbitrary...

diff --git a/gpsbabel/delbin.cc b/gpsbabel/delbin.cc
index 588bd60e79fda3c0b9dad69cf2570ac6dc02b0bf..75628c7e736d56cc2fe141ce452038d6e3a3084e 100644 (file)
--- a/gpsbabel/delbin.cc
+++ b/gpsbabel/delbin.cc
@@ -1086,7 +1086,7 @@ read_waypoints(void)
       notes_i = 0;
       notes_max = 0;
       if (global_opts.debug_level >= DBGLVL_L) {
-        warning(MYNAME ": read waypoint '%s'\n", CSTRc(wp->description));
+        warning(MYNAME ": read waypoint '%s'\n", qPrintable(wp->description));
       }
     } else if (wp && id == MSG_WAYPOINT_NOTE_OUT) {
       const msg_waypoint_note_t* p = (const msg_waypoint_note_t*) msg_array[i].data;
@@ -1469,7 +1469,7 @@ write_waypoint(const Waypoint* wp)
     xfree(notes_freeable);
   }
   if (global_opts.debug_level >= DBGLVL_L) {
-    warning(MYNAME ": wrote waypoint %u '%s'\n", waypoint_i, CSTRc(name));
+    warning(MYNAME ": wrote waypoint %u '%s'\n", waypoint_i, qPrintable(name));
   }
 }
 
@@ -1584,10 +1584,10 @@ read_track(route_head* track)
       break;
     }
     if (--attempt == 0) {
-      fatal(MYNAME ": reading track '%s' failed\n", CSTRc(track->rte_name));
+      fatal(MYNAME ": reading track '%s' failed\n", qPrintable(track->rte_name));
     }
     if (global_opts.debug_level >= DBGLVL_M) {
-      warning(MYNAME ": timed out reading track '%s', retrying\n", CSTRc(track->rte_name));
+      warning(MYNAME ": timed out reading track '%s', retrying\n", qPrintable(track->rte_name));
     }
     m.size = MSG_BREAK_SIZE;
     memset(m.data, 0, m.size);
@@ -1595,7 +1595,7 @@ read_track(route_head* track)
   }
   message_free(&m);
   if (msg_array_n == 0 || message_get_id(&msg_array[0]) != MSG_TRACK_HEADER_OUT) {
-    fatal(MYNAME ": reading track '%s' failed (missing track header)\n", CSTRc(track->rte_name));
+    fatal(MYNAME ": reading track '%s' failed (missing track header)\n", qPrintable(track->rte_name));
   }
   // process track messages
   p = (const msg_track_header_t*) msg_array[0].data;
@@ -1611,7 +1611,7 @@ read_track(route_head* track)
     if (id == MSG_TRACK_POINT_OUT) {
       decode_track_point(msg_array[i].data, &wp_array_i, n_point);
     } else {
-      fatal(MYNAME ": unexpected message %x while reading track '%s'\n", id, CSTRc(track->rte_name));
+      fatal(MYNAME ": unexpected message %x while reading track '%s'\n", id, qPrintable(track->rte_name));
     }
     message_free(&msg_array[i]);
   }
@@ -1620,7 +1620,7 @@ read_track(route_head* track)
     fatal(MYNAME ": track point count mismatch, expected %u, got %u\n", n_point, wp_array_i);
   }
   if (global_opts.debug_level >= DBGLVL_L) {
-    warning(MYNAME ": read track '%s' %u points\n", CSTRc(track->rte_name), n_point);
+    warning(MYNAME ": read track '%s' %u points\n", qPrintable(track->rte_name), n_point);
   }
   for (i = 0; i < n_point; i++) {
     track_add_wpt(track, wp_array[i]);
@@ -1962,10 +1962,10 @@ read_route(route_head* route)
       break;
     }
     if (--attempt == 0) {
-      fatal(MYNAME ": reading route '%s' failed (timed out)\n", CSTRc(route->rte_name));
+      fatal(MYNAME ": reading route '%s' failed (timed out)\n", qPrintable(route->rte_name));
     }
     if (global_opts.debug_level >= DBGLVL_M) {
-      warning(MYNAME ": timed out reading route route '%s', retrying\n", CSTRc(route->rte_name));
+      warning(MYNAME ": timed out reading route route '%s', retrying\n", qPrintable(route->rte_name));
     }
     m.size = MSG_BREAK_SIZE;
     memset(m.data, 0, m.size);
@@ -1990,13 +1990,13 @@ read_route(route_head* route)
     if (id == MSG_ROUTE_POINT_OUT) {
       wp_array[wp_array_i] = decode_route_point(msg_array[i].data);
       if (global_opts.debug_level >= DBGLVL_L) {
-        warning(MYNAME ": route point '%s'\n", CSTRc(wp_array[wp_array_i]->shortname));
+        warning(MYNAME ": route point '%s'\n", qPrintable(wp_array[wp_array_i]->shortname));
       }
       wp_array_i++;
     } else if (id == MSG_ROUTE_SHAPE_OUT) {
       decode_route_shape(msg_array[i].data, &wp_array_i);
     } else {
-      fatal(MYNAME ": unexpected message %x while reading route '%s'\n", id, CSTRc(route->rte_name));
+      fatal(MYNAME ": unexpected message %x while reading route '%s'\n", id, qPrintable(route->rte_name));
     }
     message_free(&msg_array[i]);
   }

diff --git a/gpsbabel/dmtlog.cc b/gpsbabel/dmtlog.cc
index 0d467e5374d7e110db12fae55afdfae489aa9b77..a04ead1a4b9ca99c6b63449c177990397adb00b9 100644 (file)
--- a/gpsbabel/dmtlog.cc
+++ b/gpsbabel/dmtlog.cc
@@ -151,7 +151,7 @@ static void
 tlog3a_xgcb_version(xg_string args, const QXmlStreamAttributes*)
 {
   if (args != "1") {
-    fatal(MYNAME ": Unsupported file version '%s'!\n", CSTRc(args));
+    fatal(MYNAME ": Unsupported file version '%s'!\n", qPrintable(args));
   }
 }
 

diff --git a/gpsbabel/exif.cc b/gpsbabel/exif.cc
index 054329e3e8034d4b56ad0ef87f7f8f7e943de08f..19a7110b97239691c2e96f59d74d1d5dbeb36d06 100644 (file)
--- a/gpsbabel/exif.cc
+++ b/gpsbabel/exif.cc
@@ -1451,7 +1451,7 @@ exif_write(void)
     if (exif_wpt_ref == NULL) {
       warning(MYNAME ": No point with a valid timestamp found.\n");
     } else if (abs(exif_time_ref - exif_wpt_ref->creation_time.toTime_t()) > frame) {
-      warning(MYNAME ": No matching point found for image date %s!\n", CSTR(str));
+      warning(MYNAME ": No matching point found for image date %s!\n", qPrintable(str));
       if (exif_wpt_ref != NULL) {
         QString str = exif_time_str(exif_wpt_ref->creation_time.toTime_t());
         warning(MYNAME ": Best is from %s, %d second(s) away.\n",

diff --git a/gpsbabel/garmin_device_xml.cc b/gpsbabel/garmin_device_xml.cc
index 306a3870407af0d208738dee1deeb73dec75a533..4aedab33c6f1d8d2d1c763d4a17dd7295f8d9a42 100644 (file)
--- a/gpsbabel/garmin_device_xml.cc
+++ b/gpsbabel/garmin_device_xml.cc
@@ -92,7 +92,7 @@ void dir_s(xg_string args, const QXmlStreamAttributes*)
     my_gdx_info->to_device.basename = xstrdup(base);
     my_gdx_info->to_device.extension = xstrdup(ext);
   } else {
-    fatal(MYNAME ":Unknown direction '%s'\n", CSTRc(args));
+    fatal(MYNAME ":Unknown direction '%s'\n", qPrintable(args));
   }
 
   if (base) {

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index cab77f9e8dadfc63d35b6fb9694f2ba1df4dfb70..ba16219255ab1e13f1b3af99d0841f17257165a7 100644 (file)
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -842,9 +842,9 @@ read_route(void)
 
       warnings++;
       if (warnings > 3) {
-        fatal(MYNAME "-rte_pt \"%s\": too many warnings!\n", CSTRc(wpt->shortname));
+        fatal(MYNAME "-rte_pt \"%s\": too many warnings!\n", qPrintable(wpt->shortname));
       }
-      warning(MYNAME "-rte_pt \"%s\" (class %d): possible error in route.\n", CSTRc(wpt->shortname), wpt_class);
+      warning(MYNAME "-rte_pt \"%s\" (class %d): possible error in route.\n", qPrintable(wpt->shortname), wpt_class);
       warning(MYNAME "-rte_pt (dump):");
       for (i = 0; i < 18; i++) {
         warning(" %02x", (unsigned char)buf[i]);

diff --git a/gpsbabel/ignrando.cc b/gpsbabel/ignrando.cc
index bd04cceb7023b43584b127e879bf5c534b009d99..40ca97980889315b9d58abafd299eb867c044b01 100644 (file)
--- a/gpsbabel/ignrando.cc
+++ b/gpsbabel/ignrando.cc
@@ -125,7 +125,7 @@ ignr_etape_pos(xg_string args, const QXmlStreamAttributes* attrv)
   ignr_xml_error((wpt == NULL) || (args.isEmpty()));
 
   if (2 != sscanf(CSTRc(args), "%lf,%lf", &wpt->latitude, &wpt->longitude)) {
-    fatal(MYNAME ": Invalid coordinates \"%s\"!\n", CSTRc(args));
+    fatal(MYNAME ": Invalid coordinates \"%s\"!\n", qPrintable(args));
   }
 }
 
@@ -138,7 +138,7 @@ ignr_etape_alt(xg_string args, const QXmlStreamAttributes* attrv)
   }
 
   if (1 != sscanf(CSTRc(args), "%lf", &wpt->altitude)) {
-    fatal(MYNAME ": Invalid altitude \"%s\"!\n", CSTRc(args));
+    fatal(MYNAME ": Invalid altitude \"%s\"!\n", qPrintable(args));
   }
 }
 

diff --git a/gpsbabel/ik3d.cc b/gpsbabel/ik3d.cc
index 382184ae64967d89faba059f865dfb2d3da25ba2..a45b5e7819c6272fc3ea9116aed69dcdfebc20fe 100644 (file)
--- a/gpsbabel/ik3d.cc
+++ b/gpsbabel/ik3d.cc
@@ -115,7 +115,7 @@ iktobj_type(xg_string args, const QXmlStreamAttributes*)
     track = route_head_alloc();
     break;
   default:
-    fatal(MYNAME ": Unknown object type %s!\n", CSTRc(args));
+    fatal(MYNAME ": Unknown object type %s!\n", qPrintable(args));
   }
 }
 

diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc
index 97fbe5b2c32c9f94f4ad491d7b888e7229605b2d..e428a39238804a16cf8ac8bcd7d5f59bcab7e364 100644 (file)
--- a/gpsbabel/kml.cc
+++ b/gpsbabel/kml.cc
@@ -408,7 +408,7 @@ void gx_trk_coord(xg_string args, const QXmlStreamAttributes*)
   // It is not clear that coord elements without altitude are allowed, but our
   // writer produces them.
   if (0 != n && 2 != n && 3 != n) {
-    fatal(MYNAME ": gx:coord field decode failure on \"%s\".\n", CSTR(args));
+    fatal(MYNAME ": gx:coord field decode failure on \"%s\".\n", qPrintable(args));
   }
   if (n >= 2) {
     trkpt->latitude = lat;

diff --git a/gpsbabel/navilink.cc b/gpsbabel/navilink.cc
index 3ff7c2000ef5aef977ece1b9c06219c52909aa71..1a5a79e435f8ae407bc4ef5e8290cb849380804e 100644 (file)
--- a/gpsbabel/navilink.cc
+++ b/gpsbabel/navilink.cc
@@ -751,7 +751,7 @@ serial_write_route_end(const route_head* route)
     rte_name = "NO NAME";
   }
   if (route_id_ptr > MAX_ROUTE_LENGTH) {
-    fatal(MYNAME ": Route %s too long\n", CSTRc(route->rte_name));
+    fatal(MYNAME ": Route %s too long\n", qPrintable(route->rte_name));
   }
 
   src = (route_id_ptr + MAX_SUBROUTE_LENGTH) / MAX_SUBROUTE_LENGTH;

diff --git a/gpsbabel/osm.cc b/gpsbabel/osm.cc
index e991dc63d33448ebf87ae252dea774b449945a0c..9db63fc14d0ca99b72ea24be343f270f776cc733 100644 (file)
--- a/gpsbabel/osm.cc
+++ b/gpsbabel/osm.cc
@@ -497,7 +497,7 @@ osm_node(xg_string args, const QXmlStreamAttributes* attrv)
     QString atstr = attrv->value("id").toString();
     wpt->description =  "osm-id " + atstr;
     if (waypoints.contains(atstr)) {
-      warning(MYNAME ": Duplicate osm-id %s!\n", CSTR(atstr));
+      warning(MYNAME ": Duplicate osm-id %s!\n", qPrintable(atstr));
     } else {
       waypoints.insert(atstr, wpt);
       wpt->wpt_flags.fmt_use = 1;
@@ -597,7 +597,7 @@ osm_way_nd(xg_string args, const QXmlStreamAttributes* attrv)
       tmp = new Waypoint(*ctmp);
       route_add_wpt(rte, tmp);
     } else {
-      warning(MYNAME ": Way reference id \"%s\" wasn't listed under nodes!\n", CSTR(atstr));
+      warning(MYNAME ": Way reference id \"%s\" wasn't listed under nodes!\n", qPrintable(atstr));
     }
   }
 }

diff --git a/gpsbabel/ozi.cc b/gpsbabel/ozi.cc
index 86a6d07bda85be40cb1fab148fcd3e9028ca3bb1..444d5d3248057754540510eb5aeb049fdd91ac04 100644 (file)
--- a/gpsbabel/ozi.cc
+++ b/gpsbabel/ozi.cc
@@ -749,7 +749,7 @@ data_read(void)
       datum = GPS_Lookup_Datum_Index(buff);
 
       if (datum < 0) {
-        fatal(MYNAME ": Unsupported datum '%s'.\n", CSTR(buff));
+        fatal(MYNAME ": Unsupported datum '%s'.\n", qPrintable(buff));
       }
     } else if (linecount == 3) {
       if (buff.startsWith( "Altitude is in ", Qt::CaseInsensitive)) {
@@ -761,7 +761,7 @@ data_read(void)
           altunit = 'm';
           alt_scale = 1.0;
         } else {
-          fatal(MYNAME ": Unknown unit (%s) used by altitude values!\n", CSTR(unit));
+          fatal(MYNAME ": Unknown unit (%s) used by altitude values!\n", qPrintable(unit));
         }
       }
     } else if ((linecount == 5) && (ozi_objective == trkdata)) {

diff --git a/gpsbabel/pocketfms_wp.cc b/gpsbabel/pocketfms_wp.cc
index 8e68ff852ffdb4e776a001b61b266a7b85b087b6..14b80515675000df5dd2ed4e96b78bbf0f43b033 100644 (file)
--- a/gpsbabel/pocketfms_wp.cc
+++ b/gpsbabel/pocketfms_wp.cc
@@ -74,13 +74,13 @@ data_read(void)
     wpt->shortname = s;
     s = csv_lineparse(NULL, "\\w", "", linecount);
     if (!s) {
-      fatal(MYNAME "Invalid latitude %s", CSTRc(wpt->shortname));
+      fatal(MYNAME "Invalid latitude %s", qPrintable(wpt->shortname));
     }
     wpt->latitude = wppos_to_dec(s);
 
     s = csv_lineparse(NULL, "\\w", "", linecount);
     if (!s) {
-      fatal(MYNAME "Invalid longitude %s", CSTRc(wpt->shortname));
+      fatal(MYNAME "Invalid longitude %s", qPrintable(wpt->shortname));
     }
     wpt->longitude = wppos_to_dec(s);
     waypt_add(wpt);

diff --git a/gpsbabel/unicsv.cc b/gpsbabel/unicsv.cc
index 2a63ff890ce5ff1202c77dc53f36572999cca047..86116b4f431163ce88dd378a36b2ebfbd173e77e 100644 (file)
--- a/gpsbabel/unicsv.cc
+++ b/gpsbabel/unicsv.cc
@@ -567,7 +567,7 @@ unicsv_fondle_header(const char* ibuf)
       f++;
     }
     if ((! f->name) && global_opts.debug_level) {
-      warning(MYNAME ": Unhandled column \"%s\".\n", CSTR(s));
+      warning(MYNAME ": Unhandled column \"%s\".\n", qPrintable(s));
     }
 
     /* handle some special items */